bitkeeper revision 1.1236.34.8 (42373942-BgO6YSNJMW5PAsR4tv0aA)

A few PPC cleanups.
Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>
Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/xen/include/xen/irq_cpustat.h b/xen/include/xen/irq_cpustat.h
index 9d09ad3fb88fd4c26eab81c707b7d0087748ec65..6465c8a0fee0aa198639e59f265304bf6d210a36 100644 (file)
--- a/xen/include/xen/irq_cpustat.h
+++ b/xen/include/xen/irq_cpustat.h
@@ -20,11 +20,7 @@
 
 extern irq_cpustat_t irq_stat[];
 
-#ifdef CONFIG_SMP
 #define __IRQ_STAT(cpu, member)        (irq_stat[cpu].member)
-#else
-#define __IRQ_STAT(cpu, member)        ((void)(cpu), irq_stat[0].member)
-#endif 
 
   /* arch independent irq_stat fields */
 #define softirq_pending(cpu)   __IRQ_STAT((cpu), __softirq_pending)

diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h
index 9a8746dcfdc0ea35b2e72785b6fcda517830e846..e240ea6f31188d7c1bb1ef02fa570fa10f101bda 100644 (file)
--- a/xen/include/xen/sched.h
+++ b/xen/include/xen/sched.h
@@ -22,6 +22,7 @@
 #include <xen/grant_table.h>
 #include <asm/hardirq.h>
 #include <asm/domain.h>
+#include <asm/bitops.h>
 
 extern unsigned long volatile jiffies;
 extern rwlock_t domlist_lock;

diff --git a/xen/include/xen/softirq.h b/xen/include/xen/softirq.h
index 6180dae775f0ffa9555d2a272f3ff168e1691492..06420a6f848f9bce943c75ecf1378110e97b31cc 100644 (file)
--- a/xen/include/xen/softirq.h
+++ b/xen/include/xen/softirq.h
@@ -14,6 +14,7 @@
 #include <xen/config.h>
 #include <xen/lib.h>
 #include <xen/smp.h>
+#include <xen/irq_cpustat.h>
 #include <asm/bitops.h>
 #include <asm/hardirq.h>